Browse Source

Fix accidental i18n breakage

Timothy Pearson 4 years ago
parent
commit
080749068b
3 changed files with 63 additions and 63 deletions
  1. 60
    60
      common_texts.cpp
  2. 1
    1
      tdecore/kkeyserver_x11.cpp
  3. 2
    2
      tdecore/tests/klocaletest.cpp

+ 60
- 60
common_texts.cpp View File

@@ -191,66 +191,66 @@ i18n( "Configure &Key Bindings...");
191 191
 i18n( "&Preferences...");
192 192
 i18n( "&Settings");
193 193
 i18n( "Do not show this message again");
194
-i18n(TQACCEL_OBJECT_NAME_STRING, "Escape");
195
-i18n(TQACCEL_OBJECT_NAME_STRING, "Tab");
196
-i18n(TQACCEL_OBJECT_NAME_STRING, "Backtab");
197
-i18n(TQACCEL_OBJECT_NAME_STRING, "Backspace");
198
-i18n(TQACCEL_OBJECT_NAME_STRING, "Return");
199
-i18n(TQACCEL_OBJECT_NAME_STRING, "Enter");
200
-i18n(TQACCEL_OBJECT_NAME_STRING, "Insert");
201
-i18n(TQACCEL_OBJECT_NAME_STRING, "Delete");
202
-i18n(TQACCEL_OBJECT_NAME_STRING, "Pause");
203
-i18n(TQACCEL_OBJECT_NAME_STRING, "Print");
204
-i18n(TQACCEL_OBJECT_NAME_STRING, "SysReq");
205
-i18n(TQACCEL_OBJECT_NAME_STRING, "Home");
206
-i18n(TQACCEL_OBJECT_NAME_STRING, "End");
207
-i18n(TQACCEL_OBJECT_NAME_STRING, "Left");
208
-i18n(TQACCEL_OBJECT_NAME_STRING, "Up");
209
-i18n(TQACCEL_OBJECT_NAME_STRING, "Right");
210
-i18n(TQACCEL_OBJECT_NAME_STRING, "Down");
211
-i18n(TQACCEL_OBJECT_NAME_STRING, "Prior");
212
-i18n(TQACCEL_OBJECT_NAME_STRING, "Next");
213
-i18n(TQACCEL_OBJECT_NAME_STRING, "Shift");
214
-i18n(TQACCEL_OBJECT_NAME_STRING, "Control");
215
-i18n(TQACCEL_OBJECT_NAME_STRING, "Meta");
216
-i18n(TQACCEL_OBJECT_NAME_STRING, "Alt");
217
-i18n(TQACCEL_OBJECT_NAME_STRING, "CapsLock");
218
-i18n(TQACCEL_OBJECT_NAME_STRING, "NumLock");
219
-i18n(TQACCEL_OBJECT_NAME_STRING, "ScrollLock");
220
-i18n(TQACCEL_OBJECT_NAME_STRING, "Space");
221
-i18n(TQACCEL_OBJECT_NAME_STRING, "ParenLeft");
222
-i18n(TQACCEL_OBJECT_NAME_STRING, "ParenRight");
223
-i18n(TQACCEL_OBJECT_NAME_STRING, "Asterisk");
224
-i18n(TQACCEL_OBJECT_NAME_STRING, "Plus");
225
-i18n(TQACCEL_OBJECT_NAME_STRING, "Comma");
226
-i18n(TQACCEL_OBJECT_NAME_STRING, "Minus");
227
-i18n(TQACCEL_OBJECT_NAME_STRING, "Period");
228
-i18n(TQACCEL_OBJECT_NAME_STRING, "Slash");
229
-i18n(TQACCEL_OBJECT_NAME_STRING, "Colon");
230
-i18n(TQACCEL_OBJECT_NAME_STRING, "Semicolon");
231
-i18n(TQACCEL_OBJECT_NAME_STRING, "Less");
232
-i18n(TQACCEL_OBJECT_NAME_STRING, "Equal");
233
-i18n(TQACCEL_OBJECT_NAME_STRING, "Greater");
234
-i18n(TQACCEL_OBJECT_NAME_STRING, "Question");
235
-i18n(TQACCEL_OBJECT_NAME_STRING, "BracketLeft");
236
-i18n(TQACCEL_OBJECT_NAME_STRING, "Backslash");
237
-i18n(TQACCEL_OBJECT_NAME_STRING, "BracketRight");
238
-i18n(TQACCEL_OBJECT_NAME_STRING, "AsciiCircum");
239
-i18n(TQACCEL_OBJECT_NAME_STRING, "Underscore");
240
-i18n(TQACCEL_OBJECT_NAME_STRING, "QuoteLeft");
241
-i18n(TQACCEL_OBJECT_NAME_STRING, "BraceLeft");
242
-i18n(TQACCEL_OBJECT_NAME_STRING, "BraceRight");
243
-i18n(TQACCEL_OBJECT_NAME_STRING, "AsciiTilde");
244
-i18n(TQACCEL_OBJECT_NAME_STRING, "PgUp");
245
-i18n(TQACCEL_OBJECT_NAME_STRING, "PgDown");
246
-i18n(TQACCEL_OBJECT_NAME_STRING, "Apostrophe");
247
-i18n(TQACCEL_OBJECT_NAME_STRING, "Ampersand");
248
-i18n(TQACCEL_OBJECT_NAME_STRING, "Exclam");
249
-i18n(TQACCEL_OBJECT_NAME_STRING, "Dollar");
250
-i18n(TQACCEL_OBJECT_NAME_STRING, "Percent");
251
-i18n(TQACCEL_OBJECT_NAME_STRING, "Menu");
252
-i18n(TQACCEL_OBJECT_NAME_STRING, "Help");
253
-i18n(TQACCEL_OBJECT_NAME_STRING, "NumberSign");
194
+i18n("TQAccel", "Escape");
195
+i18n("TQAccel", "Tab");
196
+i18n("TQAccel", "Backtab");
197
+i18n("TQAccel", "Backspace");
198
+i18n("TQAccel", "Return");
199
+i18n("TQAccel", "Enter");
200
+i18n("TQAccel", "Insert");
201
+i18n("TQAccel", "Delete");
202
+i18n("TQAccel", "Pause");
203
+i18n("TQAccel", "Print");
204
+i18n("TQAccel", "SysReq");
205
+i18n("TQAccel", "Home");
206
+i18n("TQAccel", "End");
207
+i18n("TQAccel", "Left");
208
+i18n("TQAccel", "Up");
209
+i18n("TQAccel", "Right");
210
+i18n("TQAccel", "Down");
211
+i18n("TQAccel", "Prior");
212
+i18n("TQAccel", "Next");
213
+i18n("TQAccel", "Shift");
214
+i18n("TQAccel", "Control");
215
+i18n("TQAccel", "Meta");
216
+i18n("TQAccel", "Alt");
217
+i18n("TQAccel", "CapsLock");
218
+i18n("TQAccel", "NumLock");
219
+i18n("TQAccel", "ScrollLock");
220
+i18n("TQAccel", "Space");
221
+i18n("TQAccel", "ParenLeft");
222
+i18n("TQAccel", "ParenRight");
223
+i18n("TQAccel", "Asterisk");
224
+i18n("TQAccel", "Plus");
225
+i18n("TQAccel", "Comma");
226
+i18n("TQAccel", "Minus");
227
+i18n("TQAccel", "Period");
228
+i18n("TQAccel", "Slash");
229
+i18n("TQAccel", "Colon");
230
+i18n("TQAccel", "Semicolon");
231
+i18n("TQAccel", "Less");
232
+i18n("TQAccel", "Equal");
233
+i18n("TQAccel", "Greater");
234
+i18n("TQAccel", "Question");
235
+i18n("TQAccel", "BracketLeft");
236
+i18n("TQAccel", "Backslash");
237
+i18n("TQAccel", "BracketRight");
238
+i18n("TQAccel", "AsciiCircum");
239
+i18n("TQAccel", "Underscore");
240
+i18n("TQAccel", "QuoteLeft");
241
+i18n("TQAccel", "BraceLeft");
242
+i18n("TQAccel", "BraceRight");
243
+i18n("TQAccel", "AsciiTilde");
244
+i18n("TQAccel", "PgUp");
245
+i18n("TQAccel", "PgDown");
246
+i18n("TQAccel", "Apostrophe");
247
+i18n("TQAccel", "Ampersand");
248
+i18n("TQAccel", "Exclam");
249
+i18n("TQAccel", "Dollar");
250
+i18n("TQAccel", "Percent");
251
+i18n("TQAccel", "Menu");
252
+i18n("TQAccel", "Help");
253
+i18n("TQAccel", "NumberSign");
254 254
 i18n("Main Toolbar");
255 255
 
256 256
 //some font styles

+ 1
- 1
tdecore/kkeyserver_x11.cpp View File

@@ -530,7 +530,7 @@ TQString Sym::toString( bool bUserSpace ) const
530 530
 	s = XKeysymToString( m_sym );
531 531
 #endif
532 532
 	capitalizeKeyname( s );
533
-	return bUserSpace ? i18n(TQACCEL_OBJECT_NAME_STRING, s.latin1()) : s;
533
+	return bUserSpace ? i18n("TQAccel", s.latin1()) : s;
534 534
 }
535 535
 
536 536
 TQString Sym::toStringInternal() const { return toString( false ); }

+ 2
- 2
tdecore/tests/klocaletest.cpp View File

@@ -182,11 +182,11 @@ int main( int argc, char ** argv )
182 182
 
183 183
   kdDebug() << "setLanguage C\n";
184 184
   TDEGlobal::locale()->setLanguage(TQString::fromLatin1("C"));
185
-  kdDebug() << "C: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl;
185
+  kdDebug() << "C: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl;
186 186
 
187 187
   kdDebug() << "setLanguage de\n";
188 188
   TDEGlobal::locale()->setLanguage(TQString::fromLatin1("de"));
189
-  kdDebug() << "de: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl;
189
+  kdDebug() << "de: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl;
190 190
 
191 191
 
192 192
   Test m;

Loading…
Cancel
Save