diff --git a/locale/bg_BG/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/bg_BG/LC_MESSAGES/statusnet.mo
rename to locale/bg/LC_MESSAGES/statusnet.mo
diff --git a/locale/bg_BG/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/bg_BG/LC_MESSAGES/statusnet.po
rename to locale/bg/LC_MESSAGES/statusnet.po
diff --git a/locale/ca_ES/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/ca_ES/LC_MESSAGES/statusnet.mo
rename to locale/ca/LC_MESSAGES/statusnet.mo
diff --git a/locale/ca_ES/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/ca_ES/LC_MESSAGES/statusnet.po
rename to locale/ca/LC_MESSAGES/statusnet.po
diff --git a/locale/cs_CZ/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/cs_CZ/LC_MESSAGES/statusnet.mo
rename to locale/cs/LC_MESSAGES/statusnet.mo
diff --git a/locale/cs_CZ/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/cs_CZ/LC_MESSAGES/statusnet.po
rename to locale/cs/LC_MESSAGES/statusnet.po
diff --git a/locale/de_DE/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/de_DE/LC_MESSAGES/statusnet.mo
rename to locale/de/LC_MESSAGES/statusnet.mo
diff --git a/locale/de_DE/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/de_DE/LC_MESSAGES/statusnet.po
rename to locale/de/LC_MESSAGES/statusnet.po
diff --git a/locale/el_GR/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/el_GR/LC_MESSAGES/statusnet.mo
rename to locale/el/LC_MESSAGES/statusnet.mo
diff --git a/locale/el_GR/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/el_GR/LC_MESSAGES/statusnet.po
rename to locale/el/LC_MESSAGES/statusnet.po
diff --git a/locale/fr_FR/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/fr_FR/LC_MESSAGES/statusnet.mo
rename to locale/fr/LC_MESSAGES/statusnet.mo
diff --git a/locale/fr_FR/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/fr_FR/LC_MESSAGES/statusnet.po
rename to locale/fr/LC_MESSAGES/statusnet.po
diff --git a/locale/he_IL/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/he_IL/LC_MESSAGES/statusnet.mo
rename to locale/he/LC_MESSAGES/statusnet.mo
diff --git a/locale/he_IL/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/he_IL/LC_MESSAGES/statusnet.po
rename to locale/he/LC_MESSAGES/statusnet.po
diff --git a/locale/is_IS/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/is_IS/LC_MESSAGES/statusnet.po
rename to locale/is/LC_MESSAGES/statusnet.po
diff --git a/locale/it_IT/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/it_IT/LC_MESSAGES/statusnet.mo
rename to locale/it/LC_MESSAGES/statusnet.mo
diff --git a/locale/it_IT/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/it_IT/LC_MESSAGES/statusnet.po
rename to locale/it/LC_MESSAGES/statusnet.po
diff --git a/locale/ja_JP/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/ja_JP/LC_MESSAGES/statusnet.mo
rename to locale/ja/LC_MESSAGES/statusnet.mo
diff --git a/locale/ja_JP/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/ja_JP/LC_MESSAGES/statusnet.po
rename to locale/ja/LC_MESSAGES/statusnet.po
diff --git a/locale/ko_KR/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/ko_KR/LC_MESSAGES/statusnet.mo
rename to locale/ko/LC_MESSAGES/statusnet.mo
diff --git a/locale/ko_KR/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/ko_KR/LC_MESSAGES/statusnet.po
rename to locale/ko/LC_MESSAGES/statusnet.po
diff --git a/locale/mk_MK/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/mk_MK/LC_MESSAGES/statusnet.mo
rename to locale/mk/LC_MESSAGES/statusnet.mo
diff --git a/locale/mk_MK/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/mk_MK/LC_MESSAGES/statusnet.po
rename to locale/mk/LC_MESSAGES/statusnet.po
diff --git a/locale/nb_NO/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/nb_NO/LC_MESSAGES/statusnet.mo
rename to locale/nb/LC_MESSAGES/statusnet.mo
diff --git a/locale/nb_NO/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/nb_NO/LC_MESSAGES/statusnet.po
rename to locale/nb/LC_MESSAGES/statusnet.po
diff --git a/locale/nl_NL/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/nl_NL/LC_MESSAGES/statusnet.mo
rename to locale/nl/LC_MESSAGES/statusnet.mo
diff --git a/locale/nl_NL/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/nl_NL/LC_MESSAGES/statusnet.po
rename to locale/nl/LC_MESSAGES/statusnet.po
diff --git a/locale/nn_NO/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/nn_NO/LC_MESSAGES/statusnet.mo
rename to locale/nn/LC_MESSAGES/statusnet.mo
diff --git a/locale/nn_NO/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/nn_NO/LC_MESSAGES/statusnet.po
rename to locale/nn/LC_MESSAGES/statusnet.po
diff --git a/locale/pl_PL/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/pl_PL/LC_MESSAGES/statusnet.mo
rename to locale/pl/LC_MESSAGES/statusnet.mo
diff --git a/locale/pl_PL/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/pl_PL/LC_MESSAGES/statusnet.po
rename to locale/pl/LC_MESSAGES/statusnet.po
diff --git a/locale/ru_RU/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/ru_RU/LC_MESSAGES/statusnet.mo
rename to locale/ru/LC_MESSAGES/statusnet.mo
diff --git a/locale/ru_RU/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/ru_RU/LC_MESSAGES/statusnet.po
rename to locale/ru/LC_MESSAGES/statusnet.po
diff --git a/locale/sv_SE/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/sv_SE/LC_MESSAGES/statusnet.mo
rename to locale/sv/LC_MESSAGES/statusnet.mo
diff --git a/locale/sv_SE/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/sv_SE/LC_MESSAGES/statusnet.po
rename to locale/sv/LC_MESSAGES/statusnet.po
diff --git a/locale/te_IN/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/te_IN/LC_MESSAGES/statusnet.mo
rename to locale/te/LC_MESSAGES/statusnet.mo
diff --git a/locale/te_IN/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/te_IN/LC_MESSAGES/statusnet.po
rename to locale/te/LC_MESSAGES/statusnet.po
diff --git a/locale/tr_TR/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/tr_TR/LC_MESSAGES/statusnet.mo
rename to locale/tr/LC_MESSAGES/statusnet.mo
diff --git a/locale/tr_TR/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/tr_TR/LC_MESSAGES/statusnet.po
rename to locale/tr/LC_MESSAGES/statusnet.po
diff --git a/locale/uk_UA/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/uk_UA/LC_MESSAGES/statusnet.mo
rename to locale/uk/LC_MESSAGES/statusnet.mo
diff --git a/locale/uk_UA/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/uk_UA/LC_MESSAGES/statusnet.po
rename to locale/uk/LC_MESSAGES/statusnet.po
diff --git a/locale/vi_VN/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo
similarity index 100%
rename from locale/vi_VN/LC_MESSAGES/statusnet.mo
rename to locale/vi/LC_MESSAGES/statusnet.mo
diff --git a/locale/vi_VN/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
similarity index 100%
rename from locale/vi_VN/LC_MESSAGES/statusnet.po
rename to locale/vi/LC_MESSAGES/statusnet.po